Merge branch 'master' of git://git.denx.de/u-boot-uniphier
authorTom Rini <[email protected]>
Wed, 25 Jul 2018 02:46:50 +0000 (22:46 -0400)
committerTom Rini <[email protected]>
Wed, 25 Jul 2018 02:46:50 +0000 (22:46 -0400)

Trivial merge